Fixed picking bug