fix for issue 196
Fixing merge issue
Merge pull request #208 from jdalphon/jd_issue196

Removed duplicate code