Fixed Issue #1122
Merge pull request #1140 from diegosarmentero/master

Fixed Issue #1122