Fixing message parsing with work.