Server CLI bug fixed