Who is who bug fix