[BUGFIX] Fix bug in class instanciation