replace id with name fix #7