fix promise issue
merge dev