Fixed last bug (hopefully)