Fix for Daemon