Fixing bug with annotations.