Fix some really weird timeouts on some archs

Which give such traceback
'''

if not data['data']:
TypeError: string indices must be integers, not st

'''
Merge branch 'race2' into develop