Implemented fix for #13: Retrying either {1, MAX_INT} times