Fixed Issue #1106
Merge pull request #1135 from diegosarmentero/master

 Fixed Issue #1106