fixed empty list issue