Fix issue #40.