Duct tapped previous bug.
Fixed complex type bug.