optimization #1560
Merge pull request #1561 from conejoninja/1560

optimization #1560