Again fixed pick/drop CP bug.