working on the fix atm