Bugfix for Zuba's unfix of my earlier bugfix -.-