Resolve some bugs like when we press back key