Fix for refactor