fix Issue 9276 - regression(2.061): Forward reference error
Merge pull request #1588 from 9rnsr/fix9276

Issue 9276 - regression(2.061): Forward reference error