Fix ID validation