...partial fix for issue #4