LILY-387: fixup