fixes for issue #600