(Probably) fix the blip bug