fixed recent v7