Fixes for issue #37