Fixing a fucking bug