bug fix + test for new annotation semantics