To resolve issue #1