Added 1.7.0.2 compatibility