Hopefully finally fixed everything