One more refactor fix