final fix for issue #4