fix issue #84
Merge pull request #87 from jDramaix/jd_fix_84

fix issue #84