Fixed bug with ID