Tried to fix stuff, unsuccessfully