Fixing the transfer bug that caused exceptions