Fix to hangout issue