cc @7208 did you see that @259