fixed a problem in annotation logic not correct