Callback fix v0.0.9-4