Fix the /back race issue