issue #1591 (kind of)
Merge pull request #1592 from conejoninja/1591

issue #1591 (kind of)