timeout fix #358