hack to mae 0.10.30 work