better 'rebindable' handling