Fix for issue #53