fixed CDB-1915 client side