Fixed Issue #1202
Merge pull request #1300 from diegosarmentero/master

 Fixed Issue #1202