Messed up merging of hotfix