[FIX] override picking done