Bug fix (issue #92)