Fix for structure in Firefox