fixing this shite