Working on annotation issue