utils independant and fixes