Restored compatibility with OS X 10.5