1.7 compatibility