Bugfix: 2 arguments always returned in callback