Fixed CLI domain shutdown