Fix for issue #236
Merge pull request #265 from jdalphon/jd_issue236

Fix for issue #236