Fix MB-297