New commit because Christer fucked up his method