fixed a refactoring issue