fix to refactoring raised