Bug fix(without comment out).