Bug fix. Alex, you will want this in the iteration branch.