Change timeout from 10s to 60s