Fixed Issue #1107
Merge pull request #1143 from diegosarmentero/master

 Fixed Issue #1107