Id validation bug fixed