fixed id/index inconsistency