#17 class annotation fix