fix remaining of the last bug