AdminAPI Fix