Fixing bug related to #2701
Merge pull request #2724 from permcody/bug_fix_2701

Fixing bug related to #2701