Fixing #574
Merge pull request #814 from euantorano/featurefix-754

Fixing #574