Workaround new parameter passed to swapSuggestion