FIX: Better size calculation