Fix Hex support