[BUGFIX] Invalid class name instantiation