FIX THIS MAORI ISSUE ONCE AND FOR ALL