annotated class fixed