Use correct clock in `who_master` handler