Heisenbug round 2
incremental commit