AdminAPI fix