Address #267.

@jsegu: I think this is all we need to fix this bug. Do you mind
re-doing your test run?