Resolves CNG-42