fixed regression of refactoring