"fix" #1378
Merge pull request #1484 from conejoninja/1378

1378