solved in df2322c. Kept the part from the previous comment, though