current replace fix #2