CHECKPOINT: Bug seems to be fixed.