added 1.7 support