Fixed issues around not binding this correctly