Temp fix for Daemons