Fixed picking related bug