Added 1.8 compatibility