some bug fix in annotation process