Fix system out handling