Fixed null prevnext issue in List