Fixes #4091
Merge pull request #4092 from WilkAndy/size_4091

Fixes #4091