Add test from #1918