This block is in the incorrect place. Kyle's branch fixes it but maybe you could add an XXX to this effect for this branch.