Fix bug resulting from package refactoring