Fixed #36, keep the same with toolkit client
merge upstream develop