Fixed builtin oneDFS