Better fix for double counting of auto-transfers