final fix for the issue #9