RapidFTR #1523 (Sumit) fixed failing cuckes.