Fix class storage