refix the last bug