Event 97

comparing against master
This is fixed.