added 10.7 compatibility