Add check for length of ...