new fixes that likely dont work