Fixed simultaneity bug