Fixed bug with events setting not being saved