Increase timeout and add double check logic. @moleculext!