Fixed last bug