Improving issue #61