fixing IDs