fix rebind