fix the last bug