fix regression from refactor