Trying to fix weird stuff