small improvement, remove a bug.