Fix Mako AND Maguro