some fixs :)