p. 444: closes issue #21