Try to fix 504 timeout error