change to compile on 1.6 again