fix item mixed up issue