quick fix to refactoring