Change timeout to 30s