Thanks for the bug report.  Does the attached patch fix things for you? 
  I can't easily test it myself, as I don't use OS X.