resolving issue #2095