Fixing jdaddy