One more change that is associated with #22.