Merge pull request #1351 from lonnen/pr-428

fixes bug 893899