This is the real fix for issue #53