Annotations removing fix, issue 36