#1090 Fixing the heisenbug