FIX issue #602
Merge pull request #604 from sescandell/fix-issue602

FIX issue #602