Fix bug on confirmation of picking

Merged Santiago Said requested to merge BugFix into 11.0-stage
  1. Nov 28, 2018