GOLD support fixed