Another fix to daemon