Fix for structures