Fix for utilities refactoring