fixing fucked up shit