-- Fixed error in string replace