Same exact problem with a 2016 unit here, glad I found this.