fixes for issue #19