use the old string replace for to fix #15