Hopefully fixing messages