Fixed a zero-length list issue