Fixed it, I hope, finally!