Fixed rebind problem