Fix admin place 2
Fix 3