[FIX] Fixing yet another search-and-replace bug.