Bugfix __construct