Fix rebinding as master