improving issue #18