fixed last bug