(Hopefully) Fixed bugfix from last commit