fixed generic admin