Fix to not use `object initializer`