Fix sublist issue