Fixed Issue #1121
Merge pull request #1141 from diegosarmentero/master

 Fixed Issue #1121