Trying to fix message parsing