Fixed problem with 1.7 compatibility