Domain fix for annotation. Awaiting transfert to plugin.