Fix Tim's shit