Tried to fix weird bug