final fix for the issue