Applied fix for filesystem/mbr_default