now correctly handling SBO for all bindings