Cup R2 Fix

Cup R2 Fix