Fixed event vs commit issue #4