Improving issue #28