Fix who_am_i call