#29 - corrected target_client assignment