Provisionally fixed #70 (requires testing)