Fix bug in autoscalar due to MM refactoring