Fixed Issue #868
Merge pull request #1152 from diegosarmentero/master

 Fixed Issue #868