revert 1.6 to 1.5 for compiling compatibility