Fix buff and id collision