go a little crazy in the example, but fix a discovered bug