GFX fix merge