Fix a bug on OS X 10.5.8
Make the fix behave the same as the code did on 'working' OSes
Merge pull request #496 from peternewman/e1.37-2

Fix a bug on OS X 10.5.8