Fixed Commands -> Messages arg passing