Hopefully fix message breakage