rebind fixes