Clean up after #117, fixes #123