some fixesd