Fix for issue #10