Additional fix for issue 9565
Merge pull request #1544 from 9rnsr/fix9565

Additional fix for issue 9565