Fixed the List hirerchy