Fixed for V7
Fixed for V7