fix for the timeout issue