Fixed Issues w/ MM