first bug in #1507
issue #1507
second bug of watermark text
Merge pull request #1516 from conejoninja/1507

1507