Fix bug DNN-3018: fix the issues mentioned in Will's screen cast.