Fixed issues with callback arguments
v1.0.3