fix for issue #3; some more