Fix annoying shoveaway bug