Fix for #53

Possible fix for issue #53