Fix 2nd occurence of issue