Fixed annotation interaction problems