Removed yet another refactor bug