changed hardcoded max wait time to 60s (from 30s)