partial fix for issue #3