Removed empty-list bug