Fixes for issue #62