Fixed all issues with IDs