Applied fixes for #73 to new list code