FIX : make pick + drop work for TFR