2 Commits (FFMMM-patch-1)