Fixing yadda integration