Fixed improper ID setup