Bug fix to combined annotation add/remove method.