fix to call callback function w/ client as "this"