Fix to my fix

Still pls test.