Fix for Minor refactoring