Testing some fixs