Fix for structures data