Fix for MB-828