Fix 504 Gateway Timeout