added 1.6 support