Fixed Issue #1234
Merge pull request #1296 from diegosarmentero/master

 Fixed Issue #1234