Hacked around various timing issues with the ST2 events