fixing the last bug so far