Clean fix for list of list scenario <Karthik>