fixed issue with replace _