Same fix applied to Ricochet