fix to google hangout
merge fix