Fixed variable mismatch due to find/replace