[FIX] Avoid endless loop when doing a return picking