Fixed mistake in refactoring, and added test to catch it in the future.
0.3.5