Fixes #48

The real fix for this issue.  The previous fix didn't always work.