Tweak for compilation for target 1.6