Resolving timeout issue