[DF-3598] - fix for Stretch Caps.