Better check on size

Better check on size