patch to fix annotation compatibility