fixed id problem
fiexed id problem2