Add fix from #1877