Added timeouts to find where the issue is