fixing  issues again