Swap fixed for older releases