finish up PR #3116

Matthias is on vacation, but there was one last tweak left before merging.

closes #3116