bug fix - last Swap message before finish gets lost