Additional fix after previous commit.