That's true. It's probably my fault. I didn't change this part of the code, after changing the code above it. Please add a FIXME here as well.