Fixing #830
Merge pull request #831 from euantorano/featurefix-830

Fixing #830