Fix #601 and added a next() function in case it fail.
Fix cyber hound