Fixed for BG/Q