Fix #224.

This seems to get the expected results without breaking anything.