Fix problem with calling callback when it's not set