[BUGFIX] Ensure output really stops on a stop command