Fix class and string