added timeout to avoid  issues