Fixed event dispatcher call

Close #34