trying to fix this sh...