clien side: fixed redundancy issue