Goldmine bugfix iteration 1