Fixing problems on yep resource