Bug fix for picking lists
Merge pull request #579 from timschofield/develop

Bug fix for picking lists