Temporary fix for the issue.