partial fix for issue #111