fix bugs in who