A fix for issue #401
Merge pull request #409 from jdalphon/jd_issue401

A fix for issue #401