Empty list bug fixed