revert using replace,  added asserts tu be sure that string is not none