fixes for issue #90