Regression fix #1
Merge pull request #577 from raven02/patch-3

Regression fix #1