MessageCommand fix