Finish 6.1.6-2