fixed the last bug