Fix class instanciation