fixing a search/replace caused bug..