Class annotations issue fix