FIX issue #646
Merge pull request #711 from sescandell/fix-issue646

FIX issue #646