Events went screwy with the switch to BST

This should fix it!