demo develop bugs fix