Little fix for BindingHandlers