Fixed broken build - somebody did some refactoring and screwed it