Fixed goto linking