Fixing Goldberg