Fixed bug with id name