#61: Fixed another bug, I think, but the test still doesn't pass.