added fix for issue #3