I'll try to test it locally if I get a chance today