Restored 10.7 support