Fixes #360. For real this time.