fix q rebind