topic branch fix