fix Issue 4757 - A forward reference error with return of inner defined struct
Merge pull request #3365 from CyberShadow/fix4757

fix Issue 4757 - A forward reference error with return of inner defined struct