Fix hardcoded ID bug