Fix bdw-gc part 2