Fix swap