* Added fix for UMD structure.