resolving issue #27