Fixed navigation for validation