fixing fucking wank bugs