Replace issue fixed