FIX: Better size check
FIX: Better size check