Improving issue #40