Resolved bug in issue #8