issue #1253 (this should be fixed too, but I couldn't reproduce the issue) and #1254  (for sure)
Merge pull request #1257 from conejoninja/gd

issue #1253 (this should be fixed too, but I couldn't reproduce the issu...