I think it might be related to #825
I think it might be related to #825