Bug fix for previous commit (issue #38)