Add workaround for mgd2 problem