fixing arguments to callbacks