hotfix (see issue 32). Issue 25 was never merged back into main.