Improve checking size