Fix bug with limit and back key