client message parsing tweak