Merge pull request #2312 from 9rnsr/fix10519

Fix up for pull 2287
fix Issue 10558 - Assertion failure on struct.c:741