Fix arguments handling in CM event handling