Fixes #36 (again)