Added code to make it 1.6 compliant