hack fix for timeouts