FIX: Better size check