Fixes #30. Leaving the logging in place for a while to be sure.