Fixed id change bug