Fixed the timeout errors with fallback mechanism