fixing bugs in Issue