fix issue with complex types names