Fixing refactor fail