fixing g8_v1