Fixing issues with hangout