Re: `make-annotation' fix