Improve (but not fix) wire protocol scenario