Fixes #1090 and removes the super.onMM() from entity