1.6 source compatibility