removed binding; fixed context issue