bug from back key fixed