Some fixxx..