fixes for issue #18