Fix stop locations NS