Regression fix #2
Merge pull request #582 from raven02/patch-7

Regression fix #343