Compile for 1.6 - again