Mmir bugfixes

Created by: mhmdmirzaei

Two bug fixes.

Merge request reports

Loading