related to the issue #4