Fix issue #40