Merge "Fix incorrect size reading"