- resolving issue #24