Recognition improvement && bug fix