annotation decoration fixes #625