Really fixed the last bug