Version swap fix for #701