Partially fix issue #1428
Merge pull request #1429 from jrfnl/Issue-1428

Partially fix issue #1428