GFM fix