[hotfix] old usage of with_default_scope has been removed