v6 Stupid fix