Fix for issue #50