Another attempt at annotation fix