Finish support for 1.6.x