Fixed hotfix fix (I'm bad at this)