timeout fix for android client