Fixes for issue #10