backport select_list changes from 1.5 so the fix for #118 works in 1.4 branch too