Commit fix for simple value picker class cast exception