fixed shtuff