Fixing a timeout issue