Fixed wall client freeze issue