Made 1.6 change