Polish daemon fix [#727]