Realy fix the last bug