Fix for MB-12513