Fix replace again