fixes for issue #28