Added 10.7 compatibility