Fixes #341 (again).