Fix some bugs in coming back