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

Fixes #4091
Merge commit '7b777f02f5e6945e279495292408b7267d5d73b6'