Fix for constructing complex types.