fixed issue with null callback