Merge "Fixing retry condition"