Fixed behaviour for system shutdown