Pick mode fix.