Scan Time Problem After Upgrade