Fix for 2-2

I'm going to write some tests for this.