need to fix the last bug