Actually working with 1.6.1