Fix general transfer logic