fixes
Merge pull request #1548 from conejoninja/1367c

1367c