Fixed missing validation