fix previous v6 impl