add fix from #1516