More annotation fix