fixes for issue #44