add fix message management