MLT-300 hotfix for bug