Fix `willCommit` &  `didCommit` default implementation