Fixed a bug I introduced when refactoring MessageParser