some fixes
Merge pull request #1559 from conejoninja/1558

some fixes