Bug fix on double MM and MV function calls