Fix to allow for non-gacela foreign keys