Fix for issue #51