Completed hotfix.