some fix on new annotation mechanism