Fix for #97

This was a wierd one, and I don't really like the fix but it does seem to work.

Check out the message for d32c742 for more details.