Fix branch switching in fabric