fix bug with reverse navigation order