Tried to fix stop/stall problems, didn't really work