utils: FIXING REGRESSION + TODO’S