Fix 504 Gateway Time-out