quickfix pre-refactor for poss. duplication