Fixed issue #40