Patching this fucking bug