Fix for pickup analyze