Fixes event dispatcher bug
Tests passing