unfinished fix for annotations processing