Make sure callback is always called.
2.0.4