Attempt at fixing the runnable removal for pvp.