Fix for complex structure