Fixed binding on restart