Final fix for the issue.