Work around a g8 problem