Fixed pick/drop CP bug.