Slight code adjustment.