Resolve issue

New feature added.