Address CR and additional problem