Final fix to sub lists