Merge error from #1057