A fix for issue #861
Merge pull request #863 from jdalphon/jd_issue861

A fix for issue #861