Make sure it works with daemon