client support bugfix and crashed test