fix for bindings edge case