Fix annotation loader