Bug fix; issue #23