NG-14178 One small change and it's perfect