over-eager find and replace :)