Fix for structures tab