Fix bug in admin command
Merge origin/master