Fixed for validation