Fixed issue with id