Fix for refactoring