Fix last blocks swap