Fixing deprecated timeout issue