bugfix while restart
merge