fixing  issues