Fixing a bug in the swap tile.
Last changes.