Fixed 'who' bug