Fixed retry / repeat options bug