Slight code tweak