PR382 roll back to fix Picker parser issues
Merge pull request #384 from skypanther/PR382rollback

PR382 roll back to fix Picker parser issues