Merge pull request #247 from spiral-project/fix-annotation-field

Fix the annotation field implementation.