Properly tag IDs to allow for correct validation, Thanks vikrum PR#9