Fixed fucked up shit