Fix a standby problem