Fix the wrong refactor again