fixed duplicated id problem