Fixing 1921.
Merge pull request #1492 from euantorano/fix-1291

Fixing 1291.