Add missed length check