Fixed MB-10098, MB-9669, MB-9611