Fixed the last bug