Implement fix suggested in issue #1