Fix for GFX from CM