Fixed bad message processing