Better code smell for 9.2