Fixed the binding issue from the previous commit