Bug fix for picking lists