FIX #531
Merge pull request #532 from ecomfe/fix-531

FIX #531