fixing shtuff