fix stage and this issue