Add another mgd2 workaround