FIX missed in refactor