Another patch by Michael Cook to fix annotation.