Fixed 1.6 and 1.7 compatibility
Fixed 1.6 and 1.7 compatibility