More thorough bug pass for List in List