Callback Invocation Bug - fix