Partly fixes my messages issue