which was broken in #332
which was broken in #332