partial fix for issue #44
more on issue #44