Add a length check too