fix weird bugs