Fix timeout 

https://app.asana.com/0/2149341064395/6462779412263