Seems we need this to avoid timeout on sauce