fix last bug