Fixes #1420
Merge pull request #1573 from diegosarmentero/master

Fixes #1420