Fixed lists to work properly