Fix struct initializer