Closes PR 14646; fixed according to Robby's suggestion