fixes for issue #2