MM-3 bug fix issue