fix for V7, working on issues reported