daimonin fixed upstream