Fix  for CLI specs