Hopefully finally got it fixed