Small tweaks. We found the Heisenbug