Prepare for hotfix