fix given issues