[Pingless] Fix