New fix for BG/Q