Bug fix close callback not triggered