Reverted to 1.6.0