Probably fixes #360