Hopefully finally fixed.