Rewrites code hotfix