always fogot to update the standby delegate, need to eliminate duplicate code
merge from origin/master