Fix to missing comments
Fix: tolerant to missing sizes