Fixes #2688
Merge pull request #2689 from jrief/fix-issue-2688

Fixes #2688