Improved size detection #67