Fixed breaking changes to 1.6.x